GtkGrid: Undo a size allocation tweak

Revert 5e1a06d1b124f09a1a54d5ae0f38905dbdc2cc81

This change caused empty rows to 'open up', which was not
intended and causes problems as seen in bug 698660.

diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 850cb094d20ee3246d2c13fdb76d265c8780c1c2..a1183e892d69504b4916815dc71590976651a003 100644 (file)
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -617,18 +617,8 @@ gtk_grid_request_init (GtkGridRequest *request,
       child = list->data;
 
       attach = &child->attach[orientation];
-      if (attach->span != 1)
-        continue;
-      if (gtk_widget_compute_expand (child->widget, orientation))
+      if (attach->span == 1 && gtk_widget_compute_expand (child->widget, orientation))
         lines->lines[attach->pos - lines->min].expand = TRUE;
-
-      lines->lines[attach->pos - lines->min].empty = FALSE;
-    }
-
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      if (lines->lines[i].empty)
-        lines->lines[i].expand = TRUE;
     }
 }
 
@@ -1037,8 +1027,6 @@ gtk_grid_request_compute_expand (GtkGridRequest *request,
          if (attach->pos + i >= max || attach->pos + 1 < min)
            continue;
 
-          if (line->empty)
-            line->expand = TRUE;
           line->empty = FALSE;
         }